fix the path issues