Fix #2298