fixed start/stop issues