fix bug all