Fixes Issue #5116

Fixes Issue #5116