Fixed wrong number of fields extraction
Fixed bad fields extraction