Implement #673