Fix stop/start problem