JR1024 fix the dates updates