Fix container (in)validation infinite recursion