Fix #1510