fixed WITHIN_RECTANGLE for cluster