Dc/Melanie |#3781 | Fixing calculation for dates