tackle call/evaluate issue