Another try with wait