Fix #2836