Fix for Issue 444
Merge pull request #480 from yearofthegus/issue-444

Fix for Issue 444