Adapt to changed container type
changes 0.6.3