ContextMenu fix