Ubuntu :: Grub Default Miscalculation In 11.04?

I notice that 11.04 Natty has changed the grub boot menu such that older kernels are stored in a submenu under an older kernels menu item. This seems to cause either grub or startupmanager to miscalculate which is the default. For example I have just two linux kernels plus a windows OS. Setting windows to be the default via the startupmanager sets

Code:

GRUB_DEFAULT=6
in /etc/default/grub.

This ends up /boot/grub/grub.cfg as a line that reads:

Code:

set default="6"

When I reboot I find the GRUB is defaulting to the first menu item. If I manually edit the line in /etc/default/grub to read

Code:

GRUB_DEFAULT=5

and then

Code:

sudo grub-update

Then grub boots with the last entry (windows) as the default.So it looks like grub doesn't count items in sub menus whereas startupmanager does so sets a wrong value. Not sure if it is grub or startup manager that is in the wrong here.