Fix portable matching