Implement issue #26