FIX: 1.9.0 regression with i18n