Fixing forwarding code