Implement #68