Fix #2947