Bugfix for broken dates