Issue4241

Integrates the only change for issue #4241 that doesn't appear to already be merged.