Fix for SubString changes