This looks weird and incorrect. If the string matching doesn't work, we should fix it.
Also I don't see, why this is related to this pull request.