Bugfix

Fixed a bug introduced by the code cleanup from last week. Sorry for
the inconvenience.