Fix waitFor