Fixing empty cvv bug