all paths now expanded, should fix #58