Array of fields now filled correctly