Fix cancel behavior for stay command