Fixed old handling of irrelevant units