Fix Issue #3327