diff --git a/src/modules/graphics/opengl/Buffer.cpp b/src/modules/graphics/opengl/Buffer.cpp
index 6bb069c54..57bbd775e 100644
--- a/src/modules/graphics/opengl/Buffer.cpp
+++ b/src/modules/graphics/opengl/Buffer.cpp
@@ -39,8 +39,8 @@ Buffer::Buffer(size_t size, const void *data, BufferType type, vertex::Usage usa
 	: love::graphics::Buffer(size, type, usage, mapflags)
 	, vbo(0)
 	, memory_map(nullptr)
-	, modified_offset(0)
-	, modified_size(0)
+	, modified_start(std::numeric_limits<size_t>::max())
+	, modified_end(0)
 {
 	target = OpenGL::getGLBufferType(type);
 
@@ -78,8 +78,8 @@ void *Buffer::map()
 
 	is_mapped = true;
 
-	modified_offset = 0;
-	modified_size = 0;
+	modified_start = std::numeric_limits<size_t>::max();
+	modified_end = 0;
 
 	return memory_map;
 }
@@ -119,21 +119,25 @@ void Buffer::unmap()
 
 	if ((map_flags & MAP_EXPLICIT_RANGE_MODIFY) != 0)
 	{
-		modified_offset = std::min(modified_offset, getSize() - 1);
-		modified_size = std::min(modified_size, getSize() - modified_offset);
+		if (modified_end >= modified_start)
+		{
+			modified_start = std::min(modified_start, getSize() - 1);
+			modified_end = std::min(modified_end, getSize() - 1);
+		}
 	}
 	else
 	{
-		modified_offset = 0;
-		modified_size = getSize();
+		modified_start = 0;
+		modified_end = getSize() - 1;
 	}
 
-	if (modified_size > 0)
+	if (modified_end >= modified_start)
 	{
+		size_t modified_size = (modified_end - modified_start) + 1;
 		switch (getUsage())
 		{
 		case vertex::USAGE_STATIC:
-			unmapStatic(modified_offset, modified_size);
+			unmapStatic(modified_start, modified_size);
 			break;
 		case vertex::USAGE_STREAM:
 			unmapStream();
@@ -145,13 +149,13 @@ void Buffer::unmap()
 			if (modified_size >= getSize() / 3)
 				unmapStream();
 			else
-				unmapStatic(modified_offset, modified_size);
+				unmapStatic(modified_start, modified_size);
 			break;
 		}
 	}
 
-	modified_offset = 0;
-	modified_size = 0;
+	modified_start = std::numeric_limits<size_t>::max();
+	modified_end = 0;
 
 	is_mapped = false;
 }
@@ -164,12 +168,8 @@ void Buffer::setMappedRangeModified(size_t offset, size_t modifiedsize)
 	// We're being conservative right now by internally marking the whole range
 	// from the start of section a to the end of section b as modified if both
 	// a and b are marked as modified.
-
-	size_t old_range_end = modified_offset + modified_size;
-	modified_offset = std::min(modified_offset, offset);
-
-	size_t new_range_end = std::max(offset + modifiedsize, old_range_end);
-	modified_size = new_range_end - modified_offset;
+	modified_start = std::min(modified_start, offset);
+	modified_end = std::max(modified_end, offset + modifiedsize - 1);
 }
 
 void Buffer::fill(size_t offset, size_t size, const void *data)
diff --git a/src/modules/graphics/opengl/Buffer.h b/src/modules/graphics/opengl/Buffer.h
index ba0a36a05..e944e0b2b 100644
--- a/src/modules/graphics/opengl/Buffer.h
+++ b/src/modules/graphics/opengl/Buffer.h
@@ -70,8 +70,8 @@ class Buffer final : public love::graphics::Buffer, public Volatile
 	// A pointer to mapped memory.
 	char *memory_map;
 
-	size_t modified_offset;
-	size_t modified_size;
+	size_t modified_start;
+	size_t modified_end;
 
 }; // Buffer