Path substitution instead of patch