Fixed locate bug