Fixed issue with extracted path being incorrect