Fix for latest g++ (clang)