Nicer fix for header offset