Fix for the location restriction