Fixed Bugs with the Dateformat