Small Bugfix 2