fix for context menu on issue #370