Bugfix finish