Correctly end previous optional tasks when a later task is completed - Correctly end previous optional tasks when a later task is completed