Added fix to retain punctuation marks by /u/a-t-k