Fix #1387