migrated to better gettext security