closed #887 closed #907