Fixed issue with too much quoting