Fix strings matching