Bugfix for dateline