fixed issue with not supporting single quote in name