Fix #1573.