done fix for date