Fix allClear handling