Fix apostrophes not handled correctly