addresses #365 - static Func variable resolution

fix rebased to 97x