Fix Issue #2949