Fix #1378