Bugfix that previous bugfix