GH-130: better effort at maintaining current directory