Fix #1571