Jack's header fix