Fixed clone_entity