#5 fixed bug which was invented at removing i18n