fix issue #2713