Bux fix

Some bug fixed