Fixed some quoting issue