Fix #1511