Resolved a bug with context menu