Fixed breaking changes introduced by the last commit.