Fixed bug with single quote in name