Fix inconsistent header size