Base of the fix for the new translation concept