fix quoting issues