Fix timing issue if first todo moved