v1.2 fixed more bugs