Fix issue with #replace causing default values to override specified