fixed the location issue