Finally fix issue with character replacement