fix the square bugs