avoid wait when we have requested stop
fix typo