fix something and add default replacement