Fixed up issue occurring on  expiry date
Fixed up issue occurring on  expiry date, specifically when fixing/expiry/settlement occur on same date