Correcting mistakes from the previous commit.