Now fixing quoting