Correction small bug caused by new substring