localization bug fixing