Fix path generation refs #807