fixed bug in new generic menu handling code