Bugfix.133

merge bugfix.133 to own master