Fixed apostrophe handling