Issue #2334871: Fix for nested containers