Fix #1561 on next