Fix #2737