Fixing an issue with quotes