Bugfix 2.0.7