Further fixing context menu.