Fixed problems with localization