Fixed invalid location issue