Implement #44