Bugfix for the Bugfix