Fixed issue for nested containers