Fix for incorrect menu items'