Fix #2944