Fix before change stack to header