[Fix] Taking care of orphans properly