fix S-expression parsing
merge S-expression parsing fix