Fix for v3.