Fixed until loop. Some dynamic menus are not working.