fixed wait logic: works now with multiple volumes