Fixing issue with double quotes