partial local variable passing fix