Fixed replacement function :scream: