Fix the fields