Fix matching for strings