Corrected date and timestamp screw up