Fix #2289