fixed. add date calculate