Improved checking header