fix context menu problems