Bugfix: Forgot some code (2)