Fix container constructor