Fix Generic/Parametric Type of fields