Fixed issue #2998