Fixed issue #2630