Trying to fix cwd and PATH bug