I had a comment here: wouldn't it be ok to change the semantics of our stop method to always set the status to `TERMINATED`?