Important fix.

Oops, this should have been a part of the previous commit.