Container bug fixed