Fixed same location issue