Bug fix with nested containers