Fix default subsitution