Bugfix 17/4