Adding required fields totally screws-up tabs.