Implement #49