fix problem with multi-value return expressions