Fix the troubles caused by the last commit.