More correct version of previous commit.