Fix squares

Michael Krause requested to merge fix_squares into master

please merge this very important changes

Merge request reports