Worked on location issue