Bug fix

Some bug fix