Fixing SCD quoting