and fix cvv2 and