diff --git a/helpers/glsize.hpp b/helpers/glsize.hpp
index 9d7efbe..2056ee8 100644
--- a/helpers/glsize.hpp
+++ b/helpers/glsize.hpp
@@ -410,6 +410,12 @@ _shadow_glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size,
                               GLvoid *data);
 
 static inline GLuint
+_glDrawRangeElements_count_helper(GLuint end, GLint basevertex)
+{
+    return end + basevertex + 1;
+}
+
+static inline GLuint
 _glDrawElementsBaseVertex_count(GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
     GLvoid *temp = 0;
@@ -494,10 +500,10 @@ _glDrawElementsBaseVertex_count(GLsizei count, GLenum type, const GLvoid *indice
     return maxindex + 1;
 }
 
-#define _glDrawRangeElementsBaseVertex_count(start, end, count, type, indices, basevertex) _glDrawElementsBaseVertex_count(count, type, indices, basevertex)
+#define _glDrawRangeElementsBaseVertex_count(start, end, count, type, indices, basevertex) _glDrawRangeElements_count_helper(end, basevertex)
 
-#define _glDrawElements_count(count, type, indices) _glDrawElementsBaseVertex_count(count, type, indices, 0);
-#define _glDrawRangeElements_count(start, end, count, type, indices) _glDrawElements_count(count, type, indices)
+#define _glDrawElements_count(count, type, indices) _glDrawElementsBaseVertex_count(count, type, indices, 0)
+#define _glDrawRangeElements_count(start, end, count, type, indices) _glDrawRangeElementsBaseVertex_count(start, end, count, type, indices, 0)
 #define _glDrawRangeElementsEXT_count _glDrawRangeElements_count
 
 /* FIXME take in consideration instancing */