Fix issue with nested containers