fixed WG bug with headu/headp order