Fix for context menus