Fixed context-menu related bug