Fixed issue with double quotes as well