WOrkaround for cwd bug on pull