diff --git a/core/src/main/java/org/gagravarr/opus/OpusFile.java b/core/src/main/java/org/gagravarr/opus/OpusFile.java
index 6ddc4be..1f4d21a 100644
--- a/core/src/main/java/org/gagravarr/opus/OpusFile.java
+++ b/core/src/main/java/org/gagravarr/opus/OpusFile.java
@@ -233,7 +233,7 @@ public void close() throws IOException {
             final int packetsSize = packets.size();
             final int maxPacketsPerPage = this.maxPacketsPerPage;
 
-            OpusAudioData packet;
+            OpusAudioData packet = null;
             int pageSize = 0;
             int pageSamples = 0;
             long lastGranule = 0;
@@ -280,11 +280,13 @@ public void close() throws IOException {
                     }
                 }
                 if (doneFlush) {   
+                    doneFlush = false;
                     pageSize = 0;
                     pageSamples = 0;
                 }
             }
-
+            if (packet != null)
+                w.setGranulePosition(packet.getGranulePosition());
             w.close();
             w = null;
             ogg.close();