diff --git a/rate_limit/rate_limit.go b/rate_limit/rate_limit.go
index 61740dc..d6f6bd0 100644
--- a/rate_limit/rate_limit.go
+++ b/rate_limit/rate_limit.go
@@ -3,12 +3,14 @@ package rate_limit
 import (
 	"encoding/gob"
 	"os"
+	"strings"
 	"time"
 )
 
 const TIMEFRAME = 60
 
 func TimeLeft(addr string) int64 {
+	addr = (strings.Split(addr, ":"))[0]
 	timeLeft := int64(0)
 	file, err := os.OpenFile("addr_table.gob", os.O_RDWR|os.O_CREATE, 0644)
 
diff --git a/request_handler.go b/request_handler.go
index 18b6356..a62462d 100644
--- a/request_handler.go
+++ b/request_handler.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"strings"
 
 	"github.com/gabdlr/api-cuit-go/rate_limit"
 )
@@ -21,12 +20,12 @@ func RequestHandler(w http.ResponseWriter, r *http.Request) {
 
 	errorResponse := &CuitError{Error: "Fallo exitosamente"}
 	argument := r.URL.Path
-
+	//fmt.Printf("%v\n", cuit.ValidateWithVerifierDigit(cuit.StandardizeCuit(argument[1:])))
 	if len(argument) == 1 {
 		errorResponse.Error = NO_SEARCH_ARG
 	} else {
-		remoteAddr := (strings.Split(r.RemoteAddr, ":"))[0]
-		timeLeft := rate_limit.TimeLeft(remoteAddr)
+		argument = argument[1:]
+		timeLeft := rate_limit.TimeLeft(r.RemoteAddr)
 
 		if timeLeft > 0 {
 			errorResponse.Error = fmt.Sprintf("Recurso no disponible, debe esperar %v segundos", timeLeft)