Proper wait with waitIndex