cxx compatibility fix