#373: cleanup
Fixed: Assign container