Change to handle logic subprocess's Wait()