fixed wh code