v1.6.0 fix bug1