Fix destroy_by_creator