diff --git a/fetcher.nix b/fetcher.nix
index fa31bb8..d3cdb92 100644
--- a/fetcher.nix
+++ b/fetcher.nix
@@ -87,10 +87,8 @@ lib.makeOverridable (
       else
         fetchzip;
 
-    revWithTag = if tag != null then "refs%2Ftags%2F${tag}" else rev;
-
     fetcherArgs =
-      _:
+      finalAttrs:
       passthruAttrs
       // (
         if useFetchGit then
@@ -114,6 +112,9 @@ lib.makeOverridable (
             };
           }
         else
+          let
+            revWithTag = finalAttrs.rev;
+          in
           {
             url = "${baseUrl}/archive/${revWithTag}";
             extension = "tar.gz";
@@ -124,6 +125,11 @@ lib.makeOverridable (
                 repo
                 tag
                 ;
+              rev = fetchgit.getRevWithTag {
+                inherit (finalAttrs) tag;
+                rev = finalAttrs.revCustom;
+              };
+              revCustom = rev;
             };
 
             passthru = {
@@ -139,7 +145,4 @@ lib.makeOverridable (
   in
 
   fetcher fetcherArgs
-  // {
-    rev = revWithTag;
-  }
 )