Update to fix the container empty problem