Fixing date calc.