#1261: Improve CVV validator