diff --git a/src/TagAny.cxx b/src/TagAny.cxx
index 54594866f..43dc15f98 100644
--- a/src/TagAny.cxx
+++ b/src/TagAny.cxx
@@ -135,7 +135,7 @@ TagScanDatabase(Client &client, const char *uri, TagHandler &handler)
 
 	{
 		const auto absolute_uri = storage->MapUTF8(uri);
-		if (uri_has_scheme(absolute_uri.c_str()))
+		if (uri_has_scheme(absolute_uri))
 			return TagScanStream(absolute_uri.c_str(), handler);
 	}
 
diff --git a/src/command/FingerprintCommands.cxx b/src/command/FingerprintCommands.cxx
index e95222052..31c3e276d 100644
--- a/src/command/FingerprintCommands.cxx
+++ b/src/command/FingerprintCommands.cxx
@@ -348,7 +348,7 @@ handle_getfingerprint(Client &client, Request args, Response &)
 			lu.path = storage->MapFS(lu.canonical_uri);
 			if (lu.path.IsNull()) {
 				uri = storage->MapUTF8(lu.canonical_uri);
-				if (!uri_has_scheme(uri.c_str()))
+				if (!uri_has_scheme(uri))
 					throw ProtocolError(ACK_ERROR_NO_EXIST, "No such song");
 			}
 		}