Fix a design flaw.