Protocol field order fix