RemoveFromIndex() is called from Reset(), Remove(), Move() and Stage(). Move() is the only one calling PrepareBatch() and then BuildFrom() gets called. Added the check to BuildFrom(). :+1: