Fix path split and overlapping (refs #720)