Better fix for the MacroBlock header