Fixes #4201
Merge pull request #4238 from raytiley/issues-4201

Fixes #4201