New language handling - bugfix