Fix on fields