moar agent forwarding -- fix