Fix #1476.