fix for start/stop