Fix Issue #4400