Implement issue #15.