Implement issue #47.
Implement issue #47.