Fixing along with i18n 0.6.11