Fixing up quoting