[v6r10] Compatibility fix