Fixing the context menu