Possible fix for forwarding