Implement #885