implement #1115