bug in v2 fixed