Added patch for cwd