Bugfix: forgot some lines during refactoring ...