since fields will become mandatory this check can go :)