Good catch. Owolabi, please go ahead and revert the changes to TopIndex and BottomIndex, but nevertheless implement the readResolve method for each of them.