Fix for #98

No more double container