Fix for multi-type systems.  Works with ZnS.