Fixed issue #2721