bugfix on stop