Fix verify_only option not working properly