Fix container for storage