Fix cleaner iteration
Merge pull request #527 from matthiasbeyer/fix-cleaner

Fix cleaner iteration