diff --git a/uk/ac/sanger/artemis/components/variant/VCFRecord.java b/uk/ac/sanger/artemis/components/variant/VCFRecord.java
index 89917c6789e0bf63e759fa2480a07c105281072a..335fae3c1e56060f7c034191f0348483e2cc2e31 100644
--- a/uk/ac/sanger/artemis/components/variant/VCFRecord.java
+++ b/uk/ac/sanger/artemis/components/variant/VCFRecord.java
@@ -73,8 +73,8 @@ public class VCFRecord
    */
   protected static VCFRecord parse(String line)
   {
-    VCFRecord rec = new VCFRecord();
-    String parts[] = line.split("\\t");
+    final VCFRecord rec = new VCFRecord();
+    final String parts[] = TAB_PATTERN.split(line);
 
     rec.chrom = parts[0];
     rec.pos   = Integer.parseInt(parts[1]);
@@ -97,15 +97,12 @@ public class VCFRecord
     if(parts.length > 9)
     {
       rec.format  = parts[8].trim();
-      int nsamples = parts.length-9;
-      int nfmt = rec.format.split(":").length;
+      final int nsamples = parts.length-9;
+      final int nfmt = rec.format.split(":").length;
       
       rec.genotypeData = new String[nsamples][nfmt];
       for(int i=0; i<nsamples; i++)
-      {
-        final String data[] = COLON_PATTERN.split(parts[9+i]);
-        rec.genotypeData[i] = data;
-      }
+        rec.genotypeData[i] = COLON_PATTERN.split(parts[9+i]);
     }
     return rec;
   }
diff --git a/uk/ac/sanger/artemis/components/variant/VCFview.java b/uk/ac/sanger/artemis/components/variant/VCFview.java
index ea5e47277c218dd36b8f81ec0a9bfb1986237412..aa8b25bba3309cde1790b179c455373e602668fd 100644
--- a/uk/ac/sanger/artemis/components/variant/VCFview.java
+++ b/uk/ac/sanger/artemis/components/variant/VCFview.java
@@ -1511,9 +1511,14 @@ public class VCFview extends JPanel
   private int getYPostion(int vcfFileIndex)
   {
     int pos = 0;
-    for(int i=0; i<vcfFileIndex; i++)
-      if(!hideVcfList.contains(i))
-        pos++;
+    if(hideVcfList.size() == 0)
+      pos = vcfFileIndex;
+    else
+    {
+      for(int i=0; i<vcfFileIndex; i++)
+        if(!hideVcfList.contains(i))
+          pos++; 
+    }
 
     return getHeight() - 15 - (pos*(LINE_HEIGHT+5));
   }