Use correct field definition for key skipping