Fixing incorrect if statement
Another attempt to fix forwarding