diff --git a/cdrskin/cdrskin.c b/cdrskin/cdrskin.c
index 3cad968..733dff6 100644
--- a/cdrskin/cdrskin.c
+++ b/cdrskin/cdrskin.c
@@ -1628,13 +1628,13 @@ int Cdrtrack_fill_fifo(struct CdrtracK *track, int fifo_start_at, int flag)
 
 int Cdrtrack_set_indice(struct CdrtracK *track, int flag)
 {
- int idx= 1, adr, prev_adr, ret;
+ int idx= 1, adr, prev_adr= -1, ret;
  char *cpt, *ept;
 
  if(track->index_string == NULL)
    return(2);
 
- for(cpt= track->index_string; ept != NULL; cpt= ept + 1) {
+ for(ept= cpt= track->index_string; ept != NULL; cpt= ept + 1) {
      ept= strchr(cpt, ',');
      if(ept != NULL)
        *ept= 0;
diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index 8370ea9..10d1880 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2012.01.05.115516"
+#define Cdrskin_timestamP "2012.01.05.120246"