Bugfix for bugfix prior to latest bugfix