Fixed last problems with localization-support