Fixed issue #2681