NoLocation fix