lets try this again, entry-header fix