mag header fix
merge;