Some bug fix in the last commit.