Bugfix for that bugfix