Fix default parameters not being replaced