Remove side effect about nextStop