Fixed some bugs extracting fields