Fixed regression with I18n