French link fixes as per BH Ticket No. 497