Get rid of a race condition by moving the waiting chan to container.start