further fix bug