Fix for containment issues