added panic on stop