Fix to get the ToDo function working