Fix forwarding system bug