context menu update for issue #577