Added changes missing from previous commit.

Sorry.