Attempt to fix v2/v3 problem.