Fix #2244