Fix #1509