Swc 816 fix header