Fixed a container bug that could have been driving some people nuts