Language merge bugfix