Fix empty container bug