Fixed issue: waddr_temp was never being set back to 0