Fix #2300