diff --git a/openhantek/ChangeLog b/openhantek/ChangeLog
index 47412b4..67b7da5 100644
--- a/openhantek/ChangeLog
+++ b/openhantek/ChangeLog
@@ -173,3 +173,6 @@
 2012-10-28 Oliver Haag  <oliver.haag@gmail.com>
 * Bugfix: DSO-2250 support, thanks to Dmitry Kolyadintsev
 * Bugfix: Remove invalid divider for large buffers
+
+2012-11-05 Oliver Haag  <oliver.haag@gmail.com>
+* Bugfix: short instead of long int for DSO-2250 trigger offset
diff --git a/openhantek/src/hantek/control.cpp b/openhantek/src/hantek/control.cpp
index 591d592..887cbeb 100644
--- a/openhantek/src/hantek/control.cpp
+++ b/openhantek/src/hantek/control.cpp
@@ -1176,8 +1176,8 @@ namespace Hantek {
 			}
 			case BULK_FSETBUFFER: {
 				// Calculate the position values (Inverse, maximum is 0x7ffff)
-				unsigned short int positionPre = 0x7ffff - this->specification.recordLengths[this->settings.recordLengthId] + positionSamples;
-				unsigned short int positionPost = 0x7ffff - positionSamples;
+				unsigned long int positionPre = 0x7fffful - this->specification.recordLengths[this->settings.recordLengthId] + positionSamples;
+				unsigned long int positionPost = 0x7fffful - positionSamples;
 				
 				// SetBuffer2250 bulk command for trigger position
 				BulkSetBuffer2250 *commandSetBuffer2250 = static_cast<BulkSetBuffer2250 *>(this->command[BULK_FSETBUFFER]);