bug fix for context menu