FIX: v6r10 conflict (still)

I guess that's quite urgent...