v1.2 fixed