Fix #1478