Fix start/stop