attempt to improve quoting