An effort to fix the bug with translations
-