correct #63, #64 and context menu event