fix field references