Fix CommandVerifier