major merge bugfix