Bugfix

merge from bugfix to master