fixing DateTime stuff