Fixed staging forwarder problem