Terminal match value conversion is now bidirectional