Update forwarder.cpp