Bugfix: Fixing the bugfix.