CRITICAL FIX: AVS fails for people with a flat number,