Fix Issue #3417