fix issues with Stop()