fix request forwarding
merge