Fix #498