Correct "'" handling