added for v1.6