Fix #1433