add Double Quotes and bug fix

add Double Quotes and bug fix