Fix #1635.