Fixes #3493
Merge pull request #3500 from bakercp/bugfix-ofPath

Fixes #3493