correctly handing vrf context. there is still a bug though