Fixed location issue