Implement issue #21