diff --git a/Source/com/drew/imaging/tiff/TiffHandler.java b/Source/com/drew/imaging/tiff/TiffHandler.java
index 6e3f33948..6f99ae922 100644
--- a/Source/com/drew/imaging/tiff/TiffHandler.java
+++ b/Source/com/drew/imaging/tiff/TiffHandler.java
@@ -46,7 +46,7 @@ public interface TiffHandler
      * @param marker the 2-byte value found at position 2 of the TIFF header
      * @return The TIFF standard via which to interpret the data stream.
      */
-    TiffStandard processTiffMarker(int marker) throws TiffProcessingException;
+    TiffStandard processTiffMarker(short marker) throws TiffProcessingException;
 
     boolean tryEnterSubIfd(int tagId);
     boolean hasFollowerIfd();
diff --git a/Source/com/drew/imaging/tiff/TiffReader.java b/Source/com/drew/imaging/tiff/TiffReader.java
index d01abb986..1182f9afd 100644
--- a/Source/com/drew/imaging/tiff/TiffReader.java
+++ b/Source/com/drew/imaging/tiff/TiffReader.java
@@ -75,7 +75,7 @@ public void processTiff(@NotNull final RandomAccessReader reader,
         }
 
         // Check the next two values for correctness.
-        final int tiffMarker = reader.getUInt16(2);
+        final short tiffMarker = (short) reader.getUInt16(2);
         final TiffStandard tiffStandard = handler.processTiffMarker(tiffMarker);
 
         boolean isBigTiff;
diff --git a/Source/com/drew/metadata/exif/ExifTiffHandler.java b/Source/com/drew/metadata/exif/ExifTiffHandler.java
index 2867ca21c..379628cc1 100644
--- a/Source/com/drew/metadata/exif/ExifTiffHandler.java
+++ b/Source/com/drew/metadata/exif/ExifTiffHandler.java
@@ -67,13 +67,13 @@ public ExifTiffHandler(@NotNull Metadata metadata, @Nullable Directory parentDir
     }
 
     @Override
-    public TiffStandard processTiffMarker(int marker) throws TiffProcessingException
+    public TiffStandard processTiffMarker(short marker) throws TiffProcessingException
     {
-        final int standardTiffMarker = 0x002A;
-        final int bigTiffMarker       = 0x002B;
-        final int olympusRawTiffMarker = 0x4F52; // for ORF files
-        final int olympusRawTiffMarker2 = 0x5352; // for ORF files
-        final int panasonicRawTiffMarker = 0x0055; // for RW2 files
+        final short standardTiffMarker = 0x002A;
+        final short bigTiffMarker       = 0x002B;
+        final short olympusRawTiffMarker = 0x4F52; // for ORF files
+        final short olympusRawTiffMarker2 = 0x5352; // for ORF files
+        final short panasonicRawTiffMarker = 0x0055; // for RW2 files
 
         switch (marker) {
             case standardTiffMarker: