fix definitions to work with new substitution