Fixes #1737
Merge pull request #1784 from ctaylo37/Fixes-#1737

Fixes #1737