diff --git a/src/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java b/src/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java
index ef15ea7ce..503f8d81b 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java
+++ b/src/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java
@@ -86,7 +86,8 @@ public final class MissingRecordAwareHSSFListener implements HSSFListener {
 				// the workbook
 				case BOFRecord.sid:
 					BOFRecord bof = (BOFRecord) record;
-					if (bof.getType() == bof.TYPE_WORKBOOK || bof.getType() == bof.TYPE_WORKSHEET) {
+					if (bof.getType() == BOFRecord.TYPE_WORKBOOK || 
+					        bof.getType() == BOFRecord.TYPE_WORKSHEET) {
 						// Reset the row and column counts - new workbook / worksheet
 						resetCounts();
 					}
@@ -106,6 +107,7 @@ public final class MissingRecordAwareHSSFListener implements HSSFListener {
 
 					// Record this as the last row we saw
 					lastRowRow = rowrec.getRowNumber();
+					lastCellColumn = -1;
 					break;
 
 				case SharedFormulaRecord.sid:
@@ -144,7 +146,8 @@ public final class MissingRecordAwareHSSFListener implements HSSFListener {
 		// If we're on cells, and this cell isn't in the same
 		//  row as the last one, then fire the
 		//  dummy end-of-row records
-		if(thisRow != lastCellRow && lastCellRow > -1) {
+		if(thisRow != lastCellRow && thisRow > 0) {
+		    if (lastCellRow == -1) lastCellRow = 0;
 			for(int i=lastCellRow; i<thisRow; i++) {
 				int cols = -1;
 				if(i == lastCellRow) {
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java b/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
index e06359301..0b41df9b7 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
+++ b/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
@@ -44,4 +44,8 @@ public final class LastCellOfRowDummyRecord extends DummyRecordBase {
 	 *  for the row.
 	 */
 	public int getLastColumnNumber() { return lastColumnNumber; }
+	
+	public String toString() {
+	    return "End-of-Row for Row=" + row + " at Column=" + lastColumnNumber;
+	}
 }
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java b/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
index 5b834ad3d..228071af2 100644
--- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
+++ b/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
@@ -567,7 +567,18 @@ public final class TestMissingRecordAwareHSSFListener extends TestCase {
         // Now onto the cells
         
         // Because the 3 first rows are missing, should have last-of-row records first
-        // TODO Fix!
+        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
+        assertEquals(0, ((LastCellOfRowDummyRecord)r[pos]).getRow());
+        assertEquals(-1, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
+        pos++;
+        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
+        assertEquals(1, ((LastCellOfRowDummyRecord)r[pos]).getRow());
+        assertEquals(-1, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
+        pos++;
+        assertEquals(LastCellOfRowDummyRecord.class, r[pos].getClass());
+        assertEquals(2, ((LastCellOfRowDummyRecord)r[pos]).getRow());
+        assertEquals(-1, ((LastCellOfRowDummyRecord)r[pos]).getLastColumnNumber());
+        pos++;
         
         
         // Onto row 4 (=3)