Fix another clang / HEAD bug