diff --git a/src/main.cpp b/src/main.cpp
index ffa54da..e5fcd02 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -56,7 +56,10 @@ void cmd_search(int argc, char **argv) {
 	int n = 100;
 	n_thread_decl;
 	std::string search(argv[0]);
-	strlist_t words = strsplitwords(strtolower(base58_strip(search)));
+	strlist_t words = strsplitwords(strtolower(search));
+
+	// Strip words from non-base58.
+	base58_strip(words);
 
 	if (argc > 1) {
 		n = atoi(argv[1]);