Fix #497