Fix #2736