come back to v2 version
fix slava's comment