Working for v1.6 and v1.7