fixing square issue