Bugfix for bugfix.