bug fix in forwarding unit