Fix #1540