Properly tagging cvv does not match

#487