Fix #2895