Fixed bugs in CellIDReencoder