Changed handling of substitutes