Merge "Fix: numFields wrong for sqlite"