Fix to required attr handling