FIX: v6r10 conflict (still)