Cloning Vats and Hospitals

If you have a RA2 style hospital and a cloning vat, by sending a unit into the hospital you get another unit out of the cloning vat. I believe, correct me if I'm wrong, that this is because the old-style hospitals destroys the infantry and then recreates another a full health (with ranks n stuff of course). If this is so a fix could be to make the cloning vat check if the building producing the infantry has Factory=infantry (or whatever).