Fix container is not always an object