Fix for stripping single quotes