Implement #41