Implement #550