diff --git a/public/gatk-tools-public/src/main/java/org/broadinstitute/gatk/utils/interval/IntervalUtils.java b/public/gatk-tools-public/src/main/java/org/broadinstitute/gatk/utils/interval/IntervalUtils.java
index faeebbf30..7fffb12e2 100644
--- a/public/gatk-tools-public/src/main/java/org/broadinstitute/gatk/utils/interval/IntervalUtils.java
+++ b/public/gatk-tools-public/src/main/java/org/broadinstitute/gatk/utils/interval/IntervalUtils.java
@@ -371,7 +371,7 @@ public class IntervalUtils {
 
 	long totalBases = 0;
 	for(GenomeLoc loc : locs)
-	    totalBases += loc.getStop() - loc.getStart();
+	    totalBases += loc.size();
 
 	long idealBasesPerPart = totalBases / scatterParts.size();
 	if(idealBasesPerPart == 0)
diff --git a/public/gatk-tools-public/src/test/java/org/broadinstitute/gatk/utils/interval/IntervalUtilsUnitTest.java b/public/gatk-tools-public/src/test/java/org/broadinstitute/gatk/utils/interval/IntervalUtilsUnitTest.java
index d21424bc3..e9846da21 100644
--- a/public/gatk-tools-public/src/test/java/org/broadinstitute/gatk/utils/interval/IntervalUtilsUnitTest.java
+++ b/public/gatk-tools-public/src/test/java/org/broadinstitute/gatk/utils/interval/IntervalUtilsUnitTest.java
@@ -671,17 +671,17 @@ public class IntervalUtilsUnitTest extends BaseTest {
         List<GenomeLoc> locs2 = IntervalUtils.parseIntervalArguments(hg18GenomeLocParser, Arrays.asList(files.get(1).toString()));
         List<GenomeLoc> locs3 = IntervalUtils.parseIntervalArguments(hg18GenomeLocParser, Arrays.asList(files.get(2).toString()));
 
-        Assert.assertEquals(locs1.size(), 1);
+        Assert.assertEquals(locs1.size(), 2);
         Assert.assertEquals(locs2.size(), 1);
-        Assert.assertEquals(locs3.size(), 2);
+        Assert.assertEquals(locs3.size(), 1);
 
         Assert.assertEquals(locs1.get(0), chr1);
-        Assert.assertEquals(locs2.get(0), chr2);
-        Assert.assertEquals(locs3.get(0), chr3);
-        Assert.assertEquals(locs3.get(1), chr4);
+        Assert.assertEquals(locs1.get(1), chr2);
+        Assert.assertEquals(locs2.get(0), chr3);
+        Assert.assertEquals(locs3.get(0), chr4);
     }
 
-    @Test(expectedExceptions=UserException.BadArgumentValue.class)
+    @Test(expectedExceptions=UserException.BadInput.class)
     public void testScatterContigIntervalsMoreFiles() {
         List<File> files = testFiles("contig_more.", 3, ".intervals");
         IntervalUtils.scatterContigIntervals(hg18Header, getLocs("chr1", "chr2"), files);