Fix pass at cxx_str