Fixed state changes while capturing todos