Fix container unloading.
Merge pull request #379 from origamiwolf/CDDA

Fix container unloading.