Fix date pop