Fix #2385