Fix #2353