Fix #497 regression.