Implement #824