Implement issue #1.