Fix indices in hooks (OMS-524)