Fixed problem with apostrophes