fix issue with forwarding requests