Added a hack to fix the path issues.