Fixed over-quoting