fix context injection