Fix for wrong indexes in incremental updates on scroll