Fixed issue: Fixed fatal i18n error and cleanup