Replace EndWith by Path.Combine