Fix issue where Todos were not removed reliably