Fixing the silly date bug/