v1.6 fix some problem