Fixes Bug_NoLocation