#189 restored context menu