Further fix to support of paths with multiple segments.