Fixed breaking problems in last commit.