Fix fields count comparison
Fix fields count comparison