Fix for another instance of the SubString bug that managed to escape the first fix.