Same bug fix (this time at cleanup)