Fix container bug