Fixed issue #2614