Fixing localization switching