Import 2374

this should fix resolving the entire path of the file correctly and not deleting the path of the lib directory and everything within it