Fix FieldCodeGeneration