Addressed issue with containers.