fixed the substitutes issue