Fix #2856