Fix #2845