diff --git a/Blarg.GameFramework/Graphics/IndexBuffer.cs b/Blarg.GameFramework/Graphics/IndexBuffer.cs
index ea2b9af..7e2fcca 100644
--- a/Blarg.GameFramework/Graphics/IndexBuffer.cs
+++ b/Blarg.GameFramework/Graphics/IndexBuffer.cs
@@ -10,7 +10,7 @@ namespace Blarg.GameFramework.Graphics
 
 		public int RemainingElements
 		{
-			get { return (NumElements - 1) - CurrentPosition; }
+			get { return NumElements - CurrentPosition; }
 		}
 
 		public override int NumElements
@@ -91,10 +91,7 @@ namespace Blarg.GameFramework.Graphics
 		{
 			++CurrentPosition;
 			if (CurrentPosition >= NumElements)
-			{
-				--CurrentPosition;
 				return false;
-			}
 			else
 				return true;
 		}
@@ -104,10 +101,7 @@ namespace Blarg.GameFramework.Graphics
 			if (CurrentPosition == 0)
 				return false;
 			else
-			{
-				--CurrentPosition;
 				return true;
-			}
 		}
 
 		public void Move(int amount)
diff --git a/Blarg.GameFramework/Graphics/VertexBuffer.cs b/Blarg.GameFramework/Graphics/VertexBuffer.cs
index 61dec00..818e7c1 100644
--- a/Blarg.GameFramework/Graphics/VertexBuffer.cs
+++ b/Blarg.GameFramework/Graphics/VertexBuffer.cs
@@ -20,7 +20,7 @@ namespace Blarg.GameFramework.Graphics
 
 		public int RemainingElements
 		{
-			get { return (NumElements - 1) - CurrentPosition; }
+			get { return NumElements - CurrentPosition; }
 		}
 
 		public override int NumElements
@@ -143,10 +143,7 @@ namespace Blarg.GameFramework.Graphics
 		{
 			++CurrentPosition;
 			if (CurrentPosition >= NumElements)
-			{
-				--CurrentPosition;
 				return false;
-			}
 			else
 				return true;
 		}
@@ -156,10 +153,7 @@ namespace Blarg.GameFramework.Graphics
 			if (CurrentPosition == 0)
 				return false;
 			else
-			{
-				--CurrentPosition;
 				return true;
-			}
 		}
 
 		public void Move(int amount)