Correctly calculate estimated completion date