Fix #2884