Fixed bug with Apostrophe