Added additional checks for forwarded for