Fixed issue #2683