fixed bug in forwarding