Fix #1369