fixes #429 and tstmtexpr