Fix #495.