NOJIRA Specify file in more robust way
Merge pull request #2504 from ctweney/filePathFix

NOJIRA Specify file in more robust way