Fix for v2.