Implement #623