Fixed corrupt cleanup [2]