fix contextual menu
Merge branch 'prt2121-master'