Fix the bug mentioned in the previous commit.