Fix for container clones