Fix issue with containers within blocks