Implement Quoting Fix