more fixes on EvaluateRetain