Making sure we aren't have the damned wait issue