Implement issue #214