Fixed new bug introduced by last bugfix!