Issue #4583

Issue #4583