FIX LOCATION BUG