fix context Bug