fixed issue #2713