Bugfix: Sloppy refactoring.