Fix #1351