v1.6.5 fixed