Now works without a linked container (again)