Fixing the substitution pattern..