Fixed the CPR check with a date check