removed all quoting, one bug fix