Make the header checking future proof