diff --git a/pkg/ptp/ptp.go b/pkg/ptp/ptp.go
index 9c52439..695ed01 100644
--- a/pkg/ptp/ptp.go
+++ b/pkg/ptp/ptp.go
@@ -104,6 +104,33 @@ type Torrent struct {
 	RemasterYear  *string `json:"RemasterYear,omitempty"`
 }
 
+// custom unmarshal method for Torrent
+func (t *Torrent) UnmarshalJSON(data []byte) error {
+	type Alias Torrent
+
+	aux := &struct {
+		Id interface{} `json:"Id"`
+		*Alias
+	}{
+		Alias: (*Alias)(t),
+	}
+
+	if err := json.Unmarshal(data, &aux); err != nil {
+		return err
+	}
+
+	switch id := aux.Id.(type) {
+	case float64:
+		t.Id = fmt.Sprintf("%.0f", id)
+	case string:
+		t.Id = id
+	default:
+		return fmt.Errorf("unexpected type for Id: %T", aux.Id)
+	}
+
+	return nil
+}
+
 func (c *Client) Do(req *http.Request) (*http.Response, error) {
 	ctx := context.Background()
 	err := c.rateLimiter.Wait(ctx) // This is a blocking call. Honors the rate limit
diff --git a/pkg/ptp/ptp_test.go b/pkg/ptp/ptp_test.go
index af8279b..6dae9b1 100644
--- a/pkg/ptp/ptp_test.go
+++ b/pkg/ptp/ptp_test.go
@@ -72,16 +72,16 @@ func TestPTPClient_GetTorrentByID(t *testing.T) {
 				APIUser: user,
 				APIKey:  key,
 			},
-			args: args{torrentID: "000001"},
+			args: args{torrentID: "1"},
 			want: &domain.TorrentBasic{
-				Id:       "000001",
+				Id:       "1",
 				InfoHash: "F57AA86DFB03F87FCC7636E310D35918442EAE5C",
 				Size:     "1344512700",
 			},
 			wantErr: false,
 		},
 		{
-			name: "get_by_id_2",
+			name: "get_by_id_not_found",
 			fields: fields{
 				Url:     ts.URL,
 				APIUser: user,
@@ -89,7 +89,7 @@ func TestPTPClient_GetTorrentByID(t *testing.T) {
 			},
 			args:    args{torrentID: "100002"},
 			want:    nil,
-			wantErr: false,
+			wantErr: true,
 		},
 	}
 	for _, tt := range tests {
@@ -97,8 +97,10 @@ func TestPTPClient_GetTorrentByID(t *testing.T) {
 			c := NewClient(tt.fields.APIUser, tt.fields.APIKey, WithUrl(ts.URL))
 
 			got, err := c.GetTorrentByID(context.Background(), tt.args.torrentID)
-			if tt.wantErr && assert.Error(t, err) {
-				assert.Equal(t, tt.wantErr, err)
+			if tt.wantErr {
+				assert.Error(t, err)
+			} else {
+				assert.NoError(t, err)
 			}
 
 			assert.Equal(t, tt.want, got)
diff --git a/pkg/ptp/testdata/ptp_get_torrent_by_id.json b/pkg/ptp/testdata/ptp_get_torrent_by_id.json
index a6719e2..b4df6bc 100644
--- a/pkg/ptp/testdata/ptp_get_torrent_by_id.json
+++ b/pkg/ptp/testdata/ptp_get_torrent_by_id.json
@@ -13,7 +13,7 @@
   "ImdbVoteCount": 1859,
   "Torrents": [
     {
-      "Id": "000001",
+      "Id": 1,
       "InfoHash": "F57AA86DFB03F87FCC7636E310D35918442EAE5C",
       "Quality": "Standard Definition",
       "Source": "DVD",