Fixed glitch with date field messing up