Bugfix merge