Changed fix to better support i18n