Fix #1577