bugfix for strange bugfix-branch