Alternative clang fix that doesn't upset gcc