Attempt a fix for !stop