Fixes Issue #5116