Implement issue #4.