diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
index 6d18f70a..6758abdb 100644
--- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
+++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
@@ -4709,7 +4709,7 @@ namespace Volian.Controls.Library
 						CellRange crDest = _owner.GetMergedRange(cr.r2 + 1, 0);
 						if (cr.r2 < crDest.r1) // It will move to the correct place
 							_owner.Select(crDest);
-						else if (crDest.r2 < _owner.Rows.Count)
+						else if (crDest.r2 < _owner.Rows.Count -1) //B2017066 check against count -1 to avoid index out of range error
 							_owner.Select(_owner.GetMergedRange(crDest.r2 + 1, 0));
 						else
 							_owner.OnCursorMovement(this, new VlnFlexGridCursorMovementEventArgs(args.Key));