fix issues with stop