Swapped self with instance reference in clone_entity