[BUGFIX] Use wrapperIndex instead of entryIndex