Problem with plus sign in path names fixed.