fixed the fields