Fix #2386