Make $stop easier to handle