Fixes #4416
Merge pull request #4417 from lukehorvat/patch-1

Fixes #4416