Fix #1453