correct v2 parsing