#195 required fields set to true