diff --git a/AUTHORS b/AUTHORS
index 51349db1c4..8b2a131c62 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -51,6 +51,7 @@ Also thanks to:
     * Dmitri Suvorov (suvjunmd)
     * Erasmus Schroder (rasco)
     * Eric Bajumpaa (SteelPhase)
+    * Evgeniy Sergeev (evgeniysergeev)
     * Fahrradkette
     * Frank Razenberg (zzattack)
     * Gareth Needham (Ripley`)
diff --git a/OpenRA.Game/Graphics/PlayerColorRemap.cs b/OpenRA.Game/Graphics/PlayerColorRemap.cs
index 362a5166f9..6f45c400c5 100644
--- a/OpenRA.Game/Graphics/PlayerColorRemap.cs
+++ b/OpenRA.Game/Graphics/PlayerColorRemap.cs
@@ -33,13 +33,14 @@ namespace OpenRA.Graphics
 			var c2 = new HSLColor(c.H, c.S, (byte)Math.Max(0, c.L - rampRange)).RGB;
 			var baseIndex = ramp[0];
 			var remapRamp = ramp.Select(r => r - ramp[0]);
+			var rampMaxIndex = ramp.Length - 1;
 
 			// reversed remapping
-			if (ramp[0] > ramp[15])
+			if (ramp[0] > ramp[rampMaxIndex])
 			{
-				baseIndex = ramp[15];
-				for (var i = 15; i > 0; i--)
-					remapRamp = ramp.Select(r => r - ramp[15]);
+				baseIndex = ramp[rampMaxIndex];
+				for (var i = rampMaxIndex; i > 0; i--)
+					remapRamp = ramp.Select(r => r - ramp[rampMaxIndex]);
 			}
 
 			remapColors = remapRamp.Select((x, i) => Pair.New(baseIndex + i, Exts.ColorLerp(x / 16f, c1, c2)))