Fix bug with duplicate menu items