Fixed indexlo as well (requires merge)