Implement issue 63