fixed the fields as much as possible