fix to square click logic