Implement issue #11