Fix latest forwarding fix