Implement #891