Fix issue with containers