Fix Substitution Mapping for inputs created independently