Fix container problem