Fix #489