Fix date initial load