Small fix with the stop/start functions