Dc/Melanie |#3783| Fixing invalid date for calculate