Attempt at fixing compatibility with GNU C++