Fix #1561