Further attempts to fix a bug with row index that was introduced in v2.5.4