fix #87 and quote name issue