[[ Bug 13467 ]] Cleaner bugfix