fixed Remove location issue