Fix #2247