bugfixes
bugfix merge