Bugfix: Fixed bug in earlier bugfix.