fix for v2