Implement #1122