Fixed assertion error caused by last commit.