fixed waitFor
rebuild