Fixed for llvm-3.5+