handle v0.2 as well