Fix for new clang