Merge bugfix