Fixed problem with contex menu