diff --git a/pom.xml b/pom.xml
index 9819009..300db32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,8 +116,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.1</version>
         <configuration>
-          <source>6</source>
-          <target>6</target>
+          <source>7</source>
+          <target>7</target>
         </configuration>
       </plugin>
     </plugins>
diff --git a/src/main/java/io/kaitai/struct/ByteBufferKaitaiStream.java b/src/main/java/io/kaitai/struct/ByteBufferKaitaiStream.java
index 5115bfe..ba03c65 100644
--- a/src/main/java/io/kaitai/struct/ByteBufferKaitaiStream.java
+++ b/src/main/java/io/kaitai/struct/ByteBufferKaitaiStream.java
@@ -162,7 +162,7 @@ public void seek(long newPos) {
     }
 
     @Override
-    public int pos() {
+    public long pos() {
         return bb.position();
     }
 
diff --git a/src/main/java/io/kaitai/struct/KaitaiStream.java b/src/main/java/io/kaitai/struct/KaitaiStream.java
index ca15b6d..8e440b0 100644
--- a/src/main/java/io/kaitai/struct/KaitaiStream.java
+++ b/src/main/java/io/kaitai/struct/KaitaiStream.java
@@ -84,7 +84,7 @@ public abstract class KaitaiStream implements Closeable {
      * Get current position of a stream pointer.
      * @return pointer position, number of bytes from the beginning of the stream
      */
-    abstract public int pos();
+    abstract public long pos();
 
     /**
      * Get total size of the stream in bytes.
diff --git a/src/main/java/io/kaitai/struct/RandomAccessFileKaitaiStream.java b/src/main/java/io/kaitai/struct/RandomAccessFileKaitaiStream.java
index 6dcd360..ca389dc 100644
--- a/src/main/java/io/kaitai/struct/RandomAccessFileKaitaiStream.java
+++ b/src/main/java/io/kaitai/struct/RandomAccessFileKaitaiStream.java
@@ -85,10 +85,9 @@ public void seek(long newPos) {
     }
 
     @Override
-    public int pos() {
+    public long pos() {
         try {
-            // FIXME cast
-            return (int) raf.getFilePointer();
+            return raf.getFilePointer();
         } catch (IOException e) {
             throw new RuntimeException(e);
         }