simpler, spare and gettext fix