fixing stop bugs