Fix date bug..