Merge branch 'master' into collaboration-sarah

1 files changed, 2 insertions, 1 deletions

diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index 42c84322b..f131927f7 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -18,6 +18,7 @@ import { DocumentsCollection } from './IDatabase';
 import { Diff, GestureContent, MessageStore, MobileDocumentUploadContent, MobileInkOverlayContent, Transferable, Types, UpdateMobileInkOverlayPositionContent, YoutubeQueryInput, YoutubeQueryTypes } from './Message';
 import { Search } from './Search';
 import { resolvedPorts } from './server_Initialization';
+var _ = require('lodash');
 
 export namespace WebSocket {
     export let _socket: Socket;
@@ -365,7 +366,7 @@ export namespace WebSocket {
             // indexesToRemove stores the indexes that we mark for deletion, which is later used to filter the list (delete the elements)
             let indexesToRemove: number[] = [];
             for (let i = 0; i < hint.deleteCount; i++) {
-                if (curList[i + hint.start] === remListItems[i]) {
+                if (curList.length > i + hint.start && _.isEqual(curList[i + hint.start], remListItems[i])) {
                     indexesToRemove.push(i + hint.start);
                     continue;
                 }