fixing location issue