Make the fix legal and actually work on clang