Fix #1417