,and fix bug