Start to fix context menu