Proposed fix for I18n-NaN issues