Bugfix and language