Bugfix for clean.php II