Move index validation after wait phase