Fixed calculation for start on weekend