fixing stop and start