More thorough quoting