Fixed issue with single quotes