apply changes from bugfix