Fix in ContextMenu