Fix Issue #5581
Merge pull request #5583 from jakebolewski/jb/fix5581

Fix Issue #5581