clang fix, clang++ not tested