- Fix #498