Fix for gcc and clang