fixed location issue