Fix util for date