Bugfix of previous bugfix