- Fix #488