Small index type fix (hapi)