Some bug fix

Some bug fix