Fix #2723