- Fix #636