Hack for single quotes inside names