- Fix #895