Simple substring fix