Bug fix for apostrophe