Fix bug with punctuation marks