fix context issues