Implement #167 on GitHub?