bug fix on resolving embedded container calls