[jh] HEADER 1 and HEADER 2 fix