Fixed bug with apostrophe