fix to apostrophe handler