Fixed for clang++