Bugfix of last bugfix (...)