Fix #2380