Revert "Revert "Fix for paths.""

This reverts commit 429b3d8400cd569feebba3e93e16618ad5cb3225.
log file