Fixed bug on new container logic