Fix #2597