Partially implement issue #8