Bugfix finalized