Fix #1573