Fixed issue #2678