Wait call fixed