Merge "Fix path interpretation on curves"