diff --git a/System/Libraries/Graphics2D.HC b/System/Libraries/Graphics2D.HC
index e3ea3f1..73c9035 100644
--- a/System/Libraries/Graphics2D.HC
+++ b/System/Libraries/Graphics2D.HC
@@ -726,14 +726,11 @@ U0 VLine2D(Context2D* ctx, I64 x, I64 y, I64 y2,
 U0 HLine2D(Context2D* ctx, I64 x, I64 y, I64 x2,
     U32 color)
 { // Draw a horizontal line.
-    if (x > ctx->width || y > ctx->height)
-        return;
     if (x2 < x)
         return;
-    while (x < x2 + 1) {
-        Plot2D(ctx, x, y, color);
-        x++;
-    }
+    I64 width = x2 - x;
+    MemSetU32(ctx->fb + (y * ctx->width) + x, color,
+        T(x + width > ctx->width, ctx->width - x, width));
 }
 
 U0 Line2D(Context2D* ctx, I64 x1, I64 y1, I64 x2, I64 y2,