- Fix #887