One more bug fix.

Same as earlier bugs.