Bugfix for bugfix for bugfix