Setup now correctly waits for halt to stop waiting