Added patch for forcing working directory