Fixed bug with default date change