Fix recursive copying