Dates Bugfix