fixed problems in the last commit.