fixing for v2