Fixing stop not ... stopping..again.