diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/genotyper/GridSearchAFEstimation.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/genotyper/GridSearchAFEstimation.java
index 6d4cbdc27..23f52471d 100755
--- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/genotyper/GridSearchAFEstimation.java
+++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/genotyper/GridSearchAFEstimation.java
@@ -228,6 +228,7 @@ public class GridSearchAFEstimation extends AlleleFrequencyCalculationModel {
             /*
             System.out.println(frequency);
             for (int i = 0; i < N; i++) {
+                System.out.print(samples.get(i));
                 for (int j=0; j < 3; j++) {
                     System.out.print(String.valueOf(matrix[i][j]));
                     System.out.print(indexes[i] == j ? "* " : " ");
@@ -280,4 +281,4 @@ public class GridSearchAFEstimation extends AlleleFrequencyCalculationModel {
             samplesToGenotypesPerAF.put(frequency, samplesToGenotypes);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/genotyper/SNPGenotypeLikelihoodsCalculationModel.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/genotyper/SNPGenotypeLikelihoodsCalculationModel.java
index cffa3c465..e744c5ca3 100755
--- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/genotyper/SNPGenotypeLikelihoodsCalculationModel.java
+++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/genotyper/SNPGenotypeLikelihoodsCalculationModel.java
@@ -35,6 +35,7 @@ import org.broadinstitute.sting.gatk.contexts.ReferenceContext;
 import org.broadinstitute.sting.gatk.refdata.RefMetaDataTracker;
 import org.broad.tribble.util.variantcontext.Allele;
 import org.apache.log4j.Logger;
+import org.broadinstitute.sting.utils.sam.GATKSAMRecord;
 
 import java.util.*;
 
@@ -115,8 +116,9 @@ public class SNPGenotypeLikelihoodsCalculationModel extends GenotypeLikelihoodsC
             // calculate the sum of quality scores for each base
             ReadBackedPileup pileup = sample.getValue().getContext(StratifiedAlignmentContext.StratifiedContextType.COMPLETE).getBasePileup();
             for ( PileupElement p : pileup ) {
-                // ignore deletions
-                if ( p.isDeletion() )
+                // ignore deletions and filtered bases
+                if ( p.isDeletion() ||
+                     (p.getRead() instanceof GATKSAMRecord && !((GATKSAMRecord)p.getRead()).isGoodBase(p.getOffset())) )
                     continue;
 
                 int index = BaseUtils.simpleBaseToBaseIndex(p.getBase());