Field names length fix.