Fixed non-required fields allow empty