Bugfix: Freeze-Bug