Fix #2320