W-4039 Make sure only kvk number is picked