Fix for subpaths