Some bug fix.