Container save fix