Fix #1669.