fixed errors in unquoting