Fix date showing bug