Fixed apostrophes bug