Minor modification to the temporary forwarder.