Correct old bug shown by tests.