Fixing a bug i introduced. forwarding twice.