Fixed issue #2684