*BUG FIX*

Further fix to the language handling.