Fixed faulty forwarders