make C++17 compliant